Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 8 Jan 2010 02:43:41 +0000 (02:43 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 8 Jan 2010 02:43:41 +0000 (02:43 +0000)

Trivial merge